api/admin_views.py

@@ -25,8 +25,8 @@ from kodo.decorators import check_admin

                 from logs.models import AdministratorLoginLogInfo, ComplementCodeLogInfo, MchInfoEncryptLogInfo
              

                 from mch.models import AdministratorInfo, BrandInfo, ConsumeInfoSubmitLogInfo, DistributorInfo, ModelInfo
              

                 from member.models import (GoodsInfo, GoodsOrderInfo, MemberActivityContributionInfo,
              

                -                           MemberActivityContributionWelfareInfo, MemberActivityGroupShareInfo, MemberActivityInfo,
              

                -                           MemberActivitySignupInfo)
              

                +                           MemberActivityContributionWelfareInfo, MemberActivityContributionWelfareUnlockingInfo,
              

                +                           MemberActivityGroupShareInfo, MemberActivityInfo, MemberActivitySignupInfo)
              

                 from pre.custom_message import sendtemplatemessage, sendwxasubscribemessage
              

                 from statistic.models import ConsumeModelSaleStatisticInfo, ConsumeSaleStatisticInfo, ConsumeUserStatisticInfo
              

                 from utils.error.errno_utils import (AdministratorStatusCode, ComplementCodeStatusCode,
              
@@ -1074,6 +1074,29 @@ def member_activity_contribute_welfare_create(request, administrator):

                 
              

                 
              

                 @check_admin
              

                +def member_activity_contribute_welfare_unlock(request, administrator):
              

                +    admin_id = request.POST.get('admin_id', '')
              

                +    contribution_id = request.POST.get('contribution_id', '')
              

                +    welfare_id = request.POST.get('welfare_id', '')
              

                +
              

                +    try:
              

                +        contribution = MemberActivityContributionInfo.objects.get(contribution_id=contribution_id, status=True)
              

                +    except MemberActivityContributionInfo.DoesNotExist:
              

                +        return response(MemberActivityContributionStatusCode.ACTIVITY_CONTRIBUTION_NOT_FOUND)
              

                +
              

                +    MemberActivityContributionWelfareUnlockingInfo.objects.create(
              

                +        brand_id=administrator.brand_id,
              

                +        admin_id=admin_id,
              

                +        user_id=contribution.user_id,
              

                +        activity_id=contribution.activity_id,
              

                +        contribution_id=contribution_id,
              

                +        welfare_id=welfare_id,
              

                +    )
              

                +
              

                +    return response(200, 'Unlock Member Activity Contribute Welfare Success', u'解锁会员活动投稿福利成功')
              

                +
              

                +
              

                +@check_admin
              

                 def coupon_list(request, administrator):
              

                     title = request.POST.get('title', '')
              

                     start_time = request.POST.get('start_time', '')
              
@@ -1472,7 +1495,7 @@ def administrator_create(request, administrator):

                 
              

                     AdministratorInfo.objects.create(
              

                         brand_id=administrator.brand_id,
              

                -        brand_name=brand_name,
              

                +        brand_name=brand_name or administrator.brand_name,
              

                         admin_type=admin_type,
              

                         phone=phone,
              

                         name=name,
              

api/urls.py

@@ -179,6 +179,7 @@ urlpatterns += [

                     url(r'^admin/member/activity/contribute/welfare/detail$', admin_views.member_activity_contribute_welfare_detail, name='member_activity_contribute_welfare_detail'),
              

                     url(r'^admin/member/activity/contribute/welfare/update$', admin_views.member_activity_contribute_welfare_update, name='member_activity_contribute_welfare_update'),
              

                     url(r'^admin/member/activity/contribute/welfare/create$', admin_views.member_activity_contribute_welfare_create, name='member_activity_contribute_welfare_create'),
              

                +    url(r'^admin/member/activity/contribute/welfare/unlock$', admin_views.member_activity_contribute_welfare_unlock, name='member_activity_contribute_welfare_unlock'),
              

                 
              

                     url(r'^admin/coupon/list$', admin_views.coupon_list, name='coupon_list'),
              

                     url(r'^admin/coupon/details$', admin_views.coupon_detail, name='coupon_detail'),
              

member/admin.py

@@ -100,7 +100,7 @@ class MemberActivityGroupShareInfoAdmin(admin.ModelAdmin):

                 
              

                 
              

                 class MemberActivityContributionInfoAdmin(admin.ModelAdmin):
              

                -    list_display = ('contribution_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'video_url', 'audit_status', 'is_selected', 'status', 'created_at', 'updated_at')
              

                +    list_display = ('contribution_id', 'user_id', 'activity_id', 'content_type', 'title', 'content', 'images', 'video_url', 'audit_status', 'is_selected', 'status', 'created_at', 'updated_at')
              

                     list_filter = ('activity_id', 'content_type', 'audit_status', 'is_selected', 'status')